refactored composer and project organization