Use bundler
Proper directory structure