Files organized, Bugfixes, a lot of changes