Remove redundant code, and cleaned up code structure.
Use origamicomet/foundation.