Started refactoring
merge with master
Merge pull request #2 from devilicecream/refactoring

Refactoring
Some fixes
Fixed upload page
Added some apis
Started biiiig refactoring of plugin
Little fix
merge