refactored project structure for aar/jar creation