refactoring file names and location of build output
refactoring and bug fixes