organized file structure
added target macros
refactoring