CLEANUP. Divided everything into files