moved everyhting to the main file