Cleaned out the code a bit, started adding support for proper meta-data for files and other stuff