changed folder structure, bug fixes, source code reformatting