Rearranging folder structure
Add generic build