reorganization in main folder