Changed structure, added autostart file