cleanup of project. Definig better package structure