Big changes. Whole reestructuration of files and classes