Restructure build
Remove redundant class