Moved stuff around
Add main file