Improve file organization