changed package structure to make gitignore work