Cleaned up and refactor folders