Cleaning up file layout