Moved startup code to startup folder