restructure directories for submission + restructuring of interfaces to fit real conditions