Refactoring and renaming compounds based on Karthas077s work.

From karthas version: compiler error fixing, bugfixing, completion, renaming and re-designing