Change to slim version 2
Delete ambiguous space
Delete obsolete files
Merge pull request #4 from fs/fix_proposed_layout_changes

Fix proposed layout changes