Moved to /src

Removed subdir
Added common intervals.