reworked movement into Main file, reworked red changes