Added runtime classes and improved the project structure