Addded autodetect
Proper directory structure