Changes on the Application files organization