Added build config files
Refactored a bit