Restructure
Remove old main file