Refactored project layout
support files