Todo: Bug fix
Merged todo
Restructured files