Restructured my files