cleaned up file layout