Code changes and folder organisation

I also changed the source filename.