Restructuring project again

basically I want a structure that is readable.