Added support for spring loaded and boot command
Minor refactorings before project splitting