restructuring directory to work better with composer