Moved startup classes to separate folder