Added some core things
Organized mostly everything