Started splitting files

Organization is still a work in progress