Cleaned up project structure to pass lint