Massive Restructure! Everything has its place :)