Adding new Files for Basic Architecture