Moving higher abstractions to base directory level