Restructure
Added files
Fixed code after restructure