changed file structure, prepared for release