Remove unnecessary files and reorganise folders