Restructured files again
wip