Organize source into different files and run astyle