Full code review

Remove/ rename/ integrate this file.