project restructurization and renaming + added more comment