Removed extra folder level in repository structure