Cleaned and reorganized repo to act completely independent from original.