moved files around
Merge pull request #2 from Keeady/popup2

moved files around