Clean up file layout