Split code into more modules, renamed some modules.
Started work on bootstrap module