Restructured files and updated docs