updating folder structure for pypi package management
merging old source with new