Code refactoring
Added build script