Feature - Update file organization