Cleaned up file layout