While we all wait for Angular2 to be ready, Angular1 is powering thousands of single page applications today. By adopting Angular2 concepts and applying them to our Angular1 application, we can win two prizes at once: Make our code cleaner, maintainable and modular while getting ready for a future migration to Angular2 when it is ready. Through this talk I will show the process of refactoring our Angular1 code to meet Angular2 concepts through a series of code examples based on real-world use cases. Finally, we will migrate the whole app to Angular2.