syntax
changed folder structure a bit