organizing into 'dev' and 'package' folder