Fixed file structure

Previous file structure change was behind. Merged recent changes in and
deleted old folders.