Reworked setup script, file structure

Reworked to better jibe with common python conventions