update gitignore
Move core modules into modules subfolder
Remove old unused code