Remove extra folder from src structure