Tweaks

Removed comments, renamed files, basic setup.