Cleaning up folder + more fixes