#32 Restructure files
Restructure files