Clean up some files & class Architecture added