Renamed some folder for more logically order