Changed Directory Structure and Converted to Angular