Moved domain code to specific folder