Organization and packages

Yaaaaay