restructuring project and fixing other stuff