Rearrange files, correct issues